Merged
Conversation
x86 EH leftover Also, delete unused NAOT table id
jkotas
added
the
area-CodeGen-coreclr
Contributor
|
Tagging subscribers to this area: @JulieLeeMSFT, @jakobbotsch |
Contributor
There was a problem hiding this comment.
Pull request overview
Removes the legacy CORINFO_HELP_ENDCATCH JIT helper (x86 EH leftover) from the JIT/EE interface and ReadyToRun helper mapping, and cleans up an unused NativeAOT reflection map blob id. The JIT/EE interface version GUID is updated accordingly.
Changes:
- Delete
CORINFO_HELP_ENDCATCHfrom the sharedCorInfoHelpFuncenums and remove its ReadyToRun helper mapping. - Mark
READYTORUN_HELPER_EndCatchas unused and remove the associated helper definition. - Remove the unused
UnboxingAndInstantiatingStubMapreflection map blob id (leave the numeric slot unused).
Reviewed changes
Copilot reviewed 8 out of 8 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| src/coreclr/tools/aot/ILCompiler.ReadyToRun/JitInterface/CorInfoImpl.ReadyToRun.cs | Drops R2R mapping for the removed JIT helper. |
| src/coreclr/tools/Common/JitInterface/CorInfoHelpFunc.cs | Removes the managed mirror enum entry for CORINFO_HELP_ENDCATCH. |
| src/coreclr/tools/Common/Internal/Runtime/MetadataBlob.cs | Marks blob id 15 as unused (removes unused NAOT table id). |
| src/coreclr/inc/readytorunhelpers.h | Removes READYTORUN_HELPER_EndCatch helper macro entry. |
| src/coreclr/inc/readytorun.h | Keeps the helper enum value but annotates it as unused since R2R v14.0. |
| src/coreclr/inc/jithelpers.h | Removes the helper table entry for CORINFO_HELP_ENDCATCH. |
| src/coreclr/inc/jiteeversionguid.h | Updates the JIT/EE version identifier GUID due to interface change. |
| src/coreclr/inc/corinfo.h | Removes the native shared enum entry for CORINFO_HELP_ENDCATCH. |
MichalStrehovsky
approved these changes
Feb 25, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
x86 EH leftover
Also, delete unused NAOT table id